Restore overwriten changes
Merge pull request #248 from liuchuangww/user

Restore overwriten changes