Last tweaks for JFX inclusion - ready for a first release now.