Add java compatibility
Update pages
Update pages
Merge remote-tracking branch 'origin/master'