Update JavaDoc.
Merge pull request #1772 from jotomo/sweating-the-small-stuff

Update JavaDoc.