Update to Settings handling
Merge pull request #219 from smasterson/SettingsChanges

Update to Settings handling