Hi,
I have attached a rolled-up-patch that contains all necessarry changes
to make it work.

Please check the C-part again because I am not quite sure with it, but
it works :)

Stefan