Fixing Java code generation
Merge pull request #127 from penguinho/master

Fixing Java code generation