Merge pull request #1 from chenshuo/master

合并原作者更新
line 130,131: use Timestamp::kMicroSecondsPerSecond instead of 1000000
Merge pull request #30 from renzhong/master

Replace magic numbers with named constants.