Merge pull request #7 from wzhen22/master

liudong 1.20
1.21 liudong
Merge pull request #8 from wzhen22/master

gsrtr
Merge pull request #31 from ldkris/master

liudong 1.21