config
Merge pull request #2 from MarinusW/master

config