Fixed Java Client
Merge pull request #60 from fakefeik/master

Fixed Java Client
Merge branch 'master' into Release