modify and optimize
Merge pull request #1 from rabbitgo/master

modify and optimize