Hello. I took a look again at your branch. Now this patch seems to be OK.

--
Nikita Pettik