Merge branch 'hotfix/0.1.1'
Fix imports
Merge branch 'hotfix/0.1.2' into develop