Merge pull request #13 from timorl/master

Fixed config