added javadocs
Merge pull request #601 from davherrmann/issue#544

added javadocs