Allow multiline descriptions

See #209 for discussion. Open for review. 
Aim: be a patch release to `1.6.1`