Better handling of users (fixes #93)
Merge pull request #110 from paulhammond/users

Better handling of users (fixes #93)