Updated the location of the text.
Merge branch 'dev' into gh-pages