Here's a revised patch, still untested, that also updates the
documentation.

       Mark