Fix for entrance
Merge branch 'release-0.1' into develop