Modified: Improved cli.
Merge pull request #1 from futoase/feature/improved-code-for-cli

Modified: Improved cli.