Updating: adding contrib/JNI; simplifying fun-names