Added command line parsing and conf file cmd line arg