Merge pull request #1 from oscu/master

merge
homework
Merge pull request #62 from luzizhuo/master

merge