Improved CLI
Merge pull request #8 from TimSimmons/cliimp

Improved CLI