Timeline error fixed
Unitt ests changed
Merge pull request #12 from kchomski/bug_829

Bug 829