Merge pull request #38 from qkhj/master

modify