displaying the markers
Merge branch 'markers'