ENH: time and clock changes. See Issue #286.

See Issue #286 for details