Merge branch 'hotfix/0.1.2'
increment version
Merge branch 'hotfix/0.1.2a' into develop