added/revised: version handling, to support nightly builds on Jenkins
cosmetics