patches sent by Matthias Drochner <M.Drochner@fz-juelich.de> and Kenneth R Westerback <kwesterback@home.com>