Merge branch 'master' into develop
Small refactoring
Merge branch 'develop'
zoom 17
reversed changes to segments