Merge pull request #1 from yunfuliu/master

test pull request ok