Merge pull request #28 from ldkris/master

liudong1.17
1.20 morning
Merge pull request #29 from ldkris/master

1.17 15.04
Merge pull request #7 from wzhen22/master

liudong 1.20