Fix timle line and some bug
Merge remote-tracking branch 'upstream/user' into user
Merge pull request #460 from liuchuangww/user

User