Merge pull request #110 from ajablonski/master

Update config settings