Made parsing of command line less manual
Made parsing of command line less manual

bamueh/dark-matter,terrycojones/dark-matter,acorg/dark-matter,terrycojones/dark-matter,bamueh/dark-matter,acorg/dark-matter