add123
merge
Merge pull request #1 from weiqiuming/master

hi