Improve output to inform the user
Merge branch 'output'