coxmatch => corrected output operator
Merge branch 'devel-0.4' into devel-0.5
Merge branch 'akoepsel/devel-0.5/working' into akoepsel/devel-0.5/testing