Added files for ch12
Merge branch 'ch12' into dev_1.0