Added command line and config file
Added csv output