* Add the control flow classes
for merge...
Merge remote-tracking branch 'simon/master'
TODO 1 and 2 for commenting