Merge pull request #107 from liuyang1/master

update chapter 16 17 code, update chapter 25 code and fix one error