[Hotfix] #544 fixes, small updates, cleanup
Merge branch 'master' of https://github.com/alterm4nn/ChronoZoom