adding support for Java default types and generics
fixes #9,#10