Merge pull request #34 from petevg/bug/fix-z-in-timestamp