Add proper command line parsing now able to specify all options (see -h for more info)