Merge pull request #1 from sirzxj/master

ceshi
Merge pull request #2 from sirzxj/master

update
Merge pull request #1 from edsn/master

test