Merge pull request #2 from tozwei/master

test