Changed timing functions and names a bit.
Merge remote-tracking branch 'origin/master'