made some changes to add to master branch
Merge pull request #3 from Hustada/updating-users

made some changes to add to master branch