Incorporated changes suggested by Yngve