Merge pull request #1 from htlxyz/master

modify code
Merge pull request #2 from htlxyz/master

modify code