Minor JavaDoc changes
Merge pull request #221 from bobbywarner/javadoc

Minor JavaDoc changes