Update the README file
Fix the highlighter configuration value
Merge branch 'master' into gh-pages

* master:
  Fix the highlighter configuration value
  Update the README file