more fixes to timing bug
Merge branch 'master' of https://github.com/penncycle/PennCycle