Refactoring of the generator
Merging with nicer api modification
Fast-forwarding and merging with RetroMocha/master
Merge pull request #9 from gabriel-dehan/enhancement/generator-refactoring

Generator refactoring