cleanup
Merge branch 'ex15' into ex15_4