Improvements to the CLI
Merge pull request #767 from RobertBColton/master

Improvements to the CLI