Merge pull request #31 from ldkris/master

liudong 1.21
Merge pull request #32 from ldkris/master

afhajds 1.21
1.21 xiawu1
Merge pull request #9 from wzhen22/master

liudong 1.21 two