Merge pull request #27 from google/timestamps

Timestamps