Merge branch "options-parsing" to "master" : Intelligent argument parsing added and possibility to specify the config file on the command line re-added.