bugfix for 353 and 956
Merge branch 'marker_bugfix' of git://github.com/GiorgiyLutidze/ChronoZoom into GiorgiyLutidze-marker_bugfix