Merge pull request #6 from atgeirr/master

Improved output facilities