second commit
Merge pull request #1 from yaoInnovation/master

second commit