bug #1600 - added timeline and tests

https://gist.github.com/novirael/25f30f3ec0992e0a743e