Merge branch 'hotfix/0.2.1'
correct package namespace
Merge branch 'hotfix/0.2.2' into develop