Merge pull request #1 from guyue/master

for test22