merge changes from Frank Trampe