>>>>> Daniel Semyonov writes:

    > I think this can be merged now.  Updated patch attached.

Here's another version which fixes a bunch of small mistakes and
clarifies some information in the manual, docstrings and comments.