javadocs
Merge pull request #784 from jrenner/master

javadocs