Updated some generation
Merge pull request #87 from chylex/master

Updated some generation