Merge branch 'hotfix_0.1'
Merge branch 'develop'