Merge branch 'develop' -v0.1.0