Add new configuration options
Merge pull request #255 from matthias-ronge/add_conf_params

Add new configuration options