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