Merge branch 'hotfix/2.10.1'

* hotfix/2.10.1:
  * Improved readme [ci skip]
Fixed generator
Merge branch 'hotfix/2.10.2' into develop

* hotfix/2.10.2:
  Fixed generator