Updated set method to check a setting is set, and update if needed.
Merge branch 'master' into develop