parse timestamp
Merge pull request #12 from nrenner/timestamp

parse timestamp