Merge pull request #889 from narfbg/develop-output

Improve the core Output library