This doesn't fix #148 but at least it makes the output less ugly.
Merge branch 'hotfix/ctrlc148' into develop