Code

Merge branch 'jc/shortstatus'