>>>>> Daniel Semyonov writes:

    > I attached a patch which incorporates the fixes
    > from my last message + changes based on comments from Stefan.

I sent a slightly out of date version of the patch with my last message.
Attached is the current version.