Refactor to better handle map markers.
Merge pull request #1 from hdemers/nice-marker

Refactor to better handle map markers.