Merge pull request #61 from Ivenyang/master

fix issue #3347 modify chapter 6.
add sample code for chapter7.
Merge commit 'd405002915c145614a2518beed10f89c2e500c68'