Merge pull request #195 from songtong/master

instrumentation bug fixed
Merge pull request #6 from dianping/master

拉取最新代码