Merge pull request #90 from evillemez/master

fixed config