Merge branch 'hotfix/0.1.2'
Merge branch 'develop'