Cli options should always override other options

Fixed for #12