CLI updated and tested.
Merge pull request #20 from lenarother/cli

CLI updated and tested.