Added some basic command line options