Code clean
Merge pull request #306 from liuchuangww/user

Code clean