cleanup
Merge branch 'ex16' into ex16_4