FIX: Improve JSDoc.
Merge branch 'master' into gh-pages
FIX: Correct couple of errors in the JSDoc.