Added a couple of command line parameters