add timestamp handling
Merge pull request #1 from rfairburn/master

add timestamp handling