Merge pull request #1 from msondheimer/master

java doc
Merge pull request #1 from rkommineni/master

Merge pull request #1 from msondheimer/master