added emphasis to text
Merge branch 'master' into gh-pages