Merge branch 'release/v0.0.1' into develop
-Fixed generators
Merge branch 'release/v0.0.2'