CLI support Bug#962879
Merge pull request #44 from mozilla/bug-962879-cli

CLI support Bug#962879