Modify

- Java.org : Add various things
Merge branch 'master' into Java