BasicGenerator refactoring
Merge pull request #142 from bkowalik/master

BasicGenerator refactoring