User preferences
Merge pull request #14 from recked/master

User preferences