changes and bugfixes submitted by Andre Eibel