Rearrange argument order
Merge pull request #111 from jmolivas/generator-fix

Rearrange argument order