Merge branch 'hotfix/0.0.6'
another fix for the buildscript
Merge branch 'hotfix/0.0.7' into develop