Progress up to chapter 5, excluding exercises in chapter 4
Merged with master