Merge pull request #37 from qkhj/master

modify