A little more JSDoc
Merge pull request #2298 from johnnyreilly/master

A little more JSDoc