Added config file and cmd options