Update management of settings
Merge pull request #2 from joegattnet/feature-update-settings-management

Update management of settings