Adding user text to output.
Merge branch 'master' into gh-pages