timeline fix
Merge pull request #3 from tomaszrondio/master

timeline fix