Merge pull request #2 from ghaynes1292/master

Polished off settings
Merge pull request #3 from ghaynes1292/master

Settings updated