Output is easier to read. Fixes #27