Fixed according to comments.
Merge branch 'better-description' into gh-pages