Merge branch 'couchdb-3291-better-formatting'

Closes #56