Fix timeline api
Merge remote-tracking branch 'upstream/user' into user
Merge pull request #430 from liuchuangww/user

Fix timeline api