* Patch by Martin Krause, 09 Oct 2003: