java SDK fixes
Merge pull request #2 from tochev/java_fixes

java SDK fixes