Add marker functionality
Merge branch 'cartographer'