Thank you for this patch. It appears that you have re-indented certain files. This makes it hard to track file changes. I am going to cherry pick the changes I can.
Please checkout the version found in HEAD (latest code from the repo) and test whether it works for you.