Format timestamp headers correctly
Merge pull request #141 from fhahn/master

Format timestamp headers correctly