My first commit
Merge pull request #8 from yenlung/master

My first commit