fixed java method return support
added null to environment
Merge branch 'dev'