Implement timestamp fix.
Merge pull request #1 from Slowpoke101/master

Update