commit 3
Merge pull request #3 from kmiao94/master

commit 2