Added bindings for python and java
fixed merge conflict