Generator upgraded
README + gitignore updated