Adding some java doc
Merge origin/new_project into new_project