Added option to return formatted text

See #169

Does this implementation looks OK to you? I'll happily change it if you had something else in mind.