Merge master
Fix chapter 3 link.