custom map markers closes #65
Merge remote-tracking branch 'origin/master'