Added command line input capability