Merge pull request #1 from shunter/master

Make output more compact.