Update to allow support for custom users.
Merge pull request #100 from chrisfranklin/patch-1

Update to allow support for custom users.