I rebased my change now, and I hope my changed commit message now conforms more the the projects standard.

I will send in another patchset including some unittests, if I can get them to work locally at my machine.

Thanks in advance,

Christian