Merge branches 'users' and 'master' into users
Merge pull request #2 from jeyq/users

Merge branches 'users' and 'master' into users