fix the java stuff
Merge branch 'hotfix/0.1.10'