Fix that + typo
Merge branch 'master' of github.com:defworkshop/defworkshop
Java interop, wip