Allow for clock drift.

I've updated the pull request of Issue #37 so that it merges cleanly to the current master.