Merge branch 'develop' for v0.1.1