Fixes TimeUtils
Merge pull request #631 from lukecampbell/time_patch

Fixes TimeUtils