Updated Java API
Merge pull request #265 from mgonto/java-api-update

Updated Java API