Merge pull request #15 from everywhere-computer/14-every-cli

Merge pull request #15 from everywhere-computer/14-every-cli #15