updated CLI client options
Merge pull request #366 from fhueske/updatedCLIOptions

updated CLI client options