cOMPLETE
Merge pull request #82 from peshmerge/NewChangesto-UserClass

Completed the user with all changes