First attempt
Fix display behavior
Merge pull request #7 from tlycken/display-nicely

Fix display behavior