add custom marker
Merge branch 'custom-marker'