Merge pull request #526 from sergeyklay/fix-user

Fix user
Updated feature: Amended PHPDoc