Added handling of hyphens at line end, revamped JNI code.