bf for 941 and 927
Merge branch 'master' of https://github.com/alterm4nn/ChronoZoom into bugfixing1
merge conflict
Merge branch 'bugfixing1' of git://github.com/GiorgiyLutidze/ChronoZoom into GiorgiyLutidze-bugfixing1