merge
Merge pull request #2 from zhonghao/master

merge