Merge pull request #1 from wzhen22/master

wz 1.22
ld1.22
liudong 1.22
Merge pull request #34 from ldkris/master

liudong1.22