Text formatting

Resolves #20, #25