Improve generation stuff
Merge pull request #38 from MalekAlrwily/master

Improve generation stuff