Hello,

I've rebased the patch onto the "master" branch.