Timing in table now displayed
Merge remote-tracking branch 'origin/master'