Fixed markup

Closes #20