Merge pull request #2 from ingjaso/master

config