Fixed Java communication
merge from master