Use non-deprecated markup method
Merge branch 'feature/28-markdown' into develop