Merge pull request #22 from gnomicstudios/marks

Marks
work-in-progress