Merge pull request #279 from stopfstedt/master

code cleanup in User class.