Added parsing of command line parameters