sdras Merge pull request #6 from setholito/field-markers