Issue #66: Added a few CLI params to the generator