Couple of generator concerns refactored
Merge branch 'master' of github.com:Yellowen/Faalis