Merge branch 'hotfix/v0.6.1'

* hotfix/v0.6.1:
  fix import
fix version stuff
Merge branch 'hotfix/v0.6.2' into develop

* hotfix/v0.6.2:
  fix version stuff