Merge pull request #25 from vikinghug/master

Branch update
Updated to work with settings namespaces
Merge pull request #27 from vikinghug/settings-namespaces

Updated to work with settings namespaces
Merge branch 'development' into feature/save-position