Fix generator
Merge branch 'develop'