Merge pull request #2 from zhlqoo/master

huiling
testtest
Merge pull request #1 from ShirleyW/master

kk