Make the generate() method more idiomatic...
#326
Merged
generate() method more idiomatic...
#326