Merged changes back to upstream.
Merge pull request #3 from roggenkamps/merge_users

Merged changes back to upstream.