Merge branch 'gh-pages'
Changed feedback text
Merge branch 'master' into gh-pages