Add support for working as a command line program
Add support for working as a command line program