Add custom timestamp support.
Add test for the custom timestamp feature.
Merge pull request #13 from adieu/dev

Add custom timestamp support.