Fixed bug 2941 (or worked around it).  Also cleaned up the display a little.
Merge pull request #68 from paulvojta/master

Fixed bug 2941 (or worked around it).  Also cleaned up the output somewhat.