done chapter 3
Merge branch '3.3.3'