added non lambda function
refacor some things
Merge branch 'feature-java-functions' into develop