Merge pull request #2 from wzhen22/master

3.14 liudong
liudong 1.14 xiawu
Merge pull request #24 from ldkris/master

liudong3.14 xiawu