edit config file
Merge pull request #1 from jyenes/feature1

Feature1