Added Java
Merge pull request #1468 from fengb/java

Added Java