Fixes #67. Simplified the timestamp code