Update timeline
Merge pull request #1 from gsarfati/update-timeline

Update timeline