0.2-hotfix1
Merge branch 'hotfix/0.2-hotfix1'