Now works with Java. Closes #20