minor revision
correct comments
Merge branch 'master' into chapter9
Merge branch 'chapter9' into chapter10