updated config
Merge pull request #81 from teharrison/master

updated config