user setting enhancements
Merge pull request #3 from va3c/master

user setting enhancements