Merge branch 'release/0.1.0'
Merge branch 'hotfix/0.1.1' into develop