Added span tag to allow pound signs to render properly
Merge branch 'master' into gh-pages