merge chapter 5 development into master