upcoming: automatic output width
Merge remote-tracking branch 'origin'