finish homework
Merge pull request #2 from li-qiang/master

finish homework