Merge branch 'release-0.1.1' into develop
cleanup
Merge branch 'develop'