Bugfix #30
Merge pull request #32 from siga111/users

Pull request for Bugfix #30