Fixes #50
Merge pull request #51 from ChromaBranding/user-settings

Fixes #50