timestamp handling missing, closes #46
Merge commit '7336d8d823d3bfa41b09c3af787dda386b0156ac'
Fix accidental space in test