First java class
Merge branch 'chaupv_branch'