Merge pull request #1 from msondheimer/master

java doc