Version 2.0.0

Merge JNI branch into main