Merge pull request #1 from jihao/master

test