Merge branch 'hotfix/0.1.1'
Bump version
Merge branch 'hotfix/0.1.2' into develop