Added command line parser