Merge pull request #67 from IanR778/timestamp_fix