Merge branch 'release/0.2.1' into develop
make suitable for production
Merge branch 'develop'