Add code to handle 10 minutes interval
Merge remote-tracking branch 'upstream/master'
fix a timeline bug
Merge pull request #27 from xiatao123/master

fix timeline issue and 10min interval