Added command line parsing of arguments