Merge branch 'release/0.1.5' into develop
Fix
Update version
Merge branch 'release/0.1.6'