Merge pull request #384 from cyb3rko/java-client-update

Merge pull request #384 from cyb3rko/java-client-update #306