fix generators
Merge branch 'develop'