Merge branch 'hotfix/0.6.1'
Hotfixing installation error
Merge branch 'hotfix/0.6.2' into develop