second commit
Merge pull request #1 from kmiao94/master

second commit