Wrap with markup

Proposed resolution for #45.