Merge remote-tracking branch 'upstream/master'
new text
Merge pull request #3 from MengQi2011/master

qww