Merge branch 'release/1.0.1' into develop
Fixed problem with routing
Merge branch 'develop'