ch5 31-36
Merge pull request #19 from hanlu-chen/develop

ch5 31-36