Map markers do some things
Merge pull request #35 from DanielFarber/master

Map markers do some things