java version, add doc and TODO on merge