Fix timestamp stuff
Merge pull request #38 from raymoo/timestamp

Fix timestamp stuff