Version fix and enhancement for classpath and build scripts.
Thanks to Niels Bertram for this work.