Merge branch 'master' into bug_1600
Merge pull request #3 from novirael/bug_1600

bug #1600 - added timeline and tests
Merge branch 'master' into bug_1616