improved timeline
dMerge branch 'master' of https://github.com/gsaito/SF28v4