Merge pull request #161 from johanobergman/rewrite

Some fixes to the client creator command
Merge remote-tracking branch 'upstream/rewrite' into rewrite