Enhanced output. Fixes #87 and fixes #104.
Merge pull request #106 from cgross/master

Enhanced output. Fixes #87 and fixes #104.