Fixed the buggy generator. Supposedly not buggy anymore
Merge pull request #2 from claudiodangelis/master

Fixed the buggy generator. Supposedly not buggy anymore