Chapter3 Scaffolding
Merge branch 'release/chapter3'