Issue #23 + version changed

* Corrected Issue #23
* Changed version to 6.0.25.0