User preferences
Merge pull request #14 from recked/master

User preferences
Merge pull request #15 from pixelmack/master

Merging master with gh-pages