Merge pull request #6 from walu/master

merge with walu
修改了一些语句
Merge pull request #7 from walu/master

merge with walu
chapter 18-20 transfer finished
fix some bug
Merge pull request #38 from wenjun1055/master

chapter 18-20 transfer finished