Merge pull request #1 from qatang/master

test