Merge pull request #1114 from alex/fixed-markup

This is a function, not a method