fixed a longstanding <code> tag error
Merge branch 'dev'