Try using code and pre tags for code samples
Merge branch 'master' into gh-pages