Merge branch 'release/1.3.1' into develop
Fix the generator, close #11
bump version
Merge branch 'release/1.3.2'