Merge pull request #16 from ShiWeitq/master

shiwei_modify,ok