Allow timestamp to be overridden.
Merge pull request #3 from pifantastic/timestamp

Allow timestamp to be overridden.