fixed a longstanding <code> tag error
Merge branch 'dev'
Merge branch 'master' into gh-pages