Fixes #38 User Settings