Merge pull request #38 from ben-ng/fixcli

Fix cli not allowing generate
Merge commit '0e99b84bf29500bafc868393338cd2e40e05a1d0' into deployment