#115: Definitions of User and Hoster are modified
Merge pull request #186 from andrewbol/Issue-115

#186: pull request #115: Definitions of User and Hoster are modified