I took some time to clean up the code a little, and to add the new
calls to the documentation.  See patch below.

--
Paul