Merge branch 'gh-pages'
Merge branch 'master' into gh-pages
Updated link, added title
updated Word glossary file