Features rescreate
Merge branch '0019-switch-on-map' into develop
Merge branch 'develop' into release-0.2