Updated and tested with jbds 7. Releasing v2.0.