Added correct command line parsing.