Remove built-in generator
Merge pull request #229 from passy/remove-generator

Remove built-in generator