Merge pull request #1 from FWAJL/Dev

Dev
Improvements to generation
Merge pull request #2 from FWAJL/master

Development