Bug fixes
timeline API change
Merge remote-tracking branch 'upstream/master'
Merge pull request #27 from candyforchris/master

updated timeline api
Merge remote-tracking branch 'origin/master'
not crashing any more