patched timings to use easytable
Merge branch 'develop'