Merge branch 'hotfix/0.6.1'

* hotfix/0.6.1:
  updated change log [ci skip]
  another fix in README [ci skip]
  [ci skip]
Fixed generator
Merge branch 'hotfix/0.6.2' into develop

* hotfix/0.6.2:
  Fixed generator