Merge pull request #348 from paulhoadley/javadoc-fix

Improves Javadoc comments.