refactoring CLI
Merge branch 'master' of github.com:rtorr/do-cli