Code

Merge branch 'jc/terminator-separator'