Fix overwrite
Merge pull request #375 from liuchuangww/user

Fix overwrite
Merge remote-tracking branch 'origin/user' into package