1.13
Merge pull request #1 from wzhen22/master

1.13 wz
1.13 xiawu
Merge pull request #21 from ldkris/master

liudong 3.11