Merge pull request #33 from ldkris/master

liudong 1.21 aftermoon
1.21 dsf
1.22
Merge pull request #1 from wzhen22/master

wz 1.22