single line output
Merge branch 'single-line-output'