Changed conf
Merge pull request #9 from whitj00/master

Changed conf