Fixed a few things for correct java here.
Merge pull request #331 from Jedwondle/master

Fixed a few things for correct java here.