Fixed Config to actually do what it was supposed to do.
Merge pull request #13 from timorl/master

Fixed config