Fix marker icon display problem
Merge branch 'master' into some_logic_fixes
Merge pull request #80 from dodobas/marker_display

Marker display