Merge branch 'develop' into 'master'

Improve output processing and readme

Only output plugin comments if there's content to display

Also, more readme improvements

See merge request !5