Merge pull request #3 from lostmsu/master

Fixes + generator tests
Pass Names and Sources test
Use parentGenerator
Delete semicolon from the end of mappings