CSP1150 A1: updated comments
Merge branch 'rewrite'