Generator working
Merge pull request #29 from Sbfrr/generator

Generator working