Added command line support and parsing of values