Develop

Command line and configuration file have changed due to refactoring of internal pipeline. There should be no more changes in this respect.