simplified, fixed scala JNI and updated to SDK-20