Merging chapter 3 changes into master