Merge branch 'release/v0.1.2'
Merge branch 'develop' into feature/testproj