[MarcelOlsz]

I haven't worked in over a year and I'm in dire straights. I'll do the OSS version later.