Merge pull request #142 from Ferada/pretty-print