Fix #388 Markdown Conversion: Rendering Content

Also updated #387 to comply with 80 char across