Please don't change the command line options. There are other features to be merged, and this may conflict with those options.