Merge pull request #216 from sergeyklay/master

Minor changes in User Module