Adding some java doc
Merge origin/master