change conf. parameters to the correct conf file
Merge pull request #2 from mrichart/master

change conf. parameters to the correct conf file