Merge java
Merge #2 java