ch-4 update
Merge branch 'ch4'