some changes as suggested by John Remijn <[email protected]>

Paul Siegmann <[email protected]>