Merge branch 'pretty-print'