Added stuff
Merge pull request #14 from mikedao/cli

Added stuff