fix Generator
Merge branch 'develop'