Merge pull request #12 from timorl/master

Completed Config
Fixed Config to actually do what it was supposed to do.