Added the additional timing functions
Fixes #36