require cl
Fixed highlighting of "with"-definitions
Merge remote-tracking branch 'origin/master'