Update generator
Merge pull request #50 from branflake2267/brandon_generator

Update generator
Merge remote-tracking branch 'origin/master' into brandon-update
Correcting some issues