pull request test
Merge pull request #69 from sunlianqiang/master

pull request test