Make the cli work better
Fix spec
Merge pull request #1 from benastan/cli

Cli