generation modified
Merge pull request #15 from kokosp/master

generation modified