Merge pull request #1 from troy123225/master

second comment