Merge pull request #706 from am11/master

Code: Assigned settings namespace