fix timestamp issues
Merge pull request #327 from wraithan/timestamp

fix timestamp issues