timelineAPI change
Merge pull request #30 from candyforchris/master

timelineAPI change
Merge remote-tracking branch 'origin/master'
did thing