pull request for Chapter 15

from pwzhu and xiangp152