Chapter 16 commit

End of chapter 16 commit
Merge branch 'Chapter_16'