more javadocs
Merge pull request #785 from jrenner/master

more javadocs