Fixing up users
Merge pull request #9 from bmneely/users

Fixing up users