handle the timestamp part neatly
Merge pull request #259 from haiwen/patch-15

handle the timestamp part neatly