Merge branch 'release/0.1.1' into develop
Fix setup
Update version
Merge branch 'release/0.1.2'