refactoring settings
Merge pull request #739 from dspaeth-faber/refactore_settings

Proposal refactore settings to show the scope of a setting