Oleg Fiksel

Sorry for the delay. I'm still planing to take this up again. Just need a bit more time.

I need more time to incorporate the changes happened in the meantime on the tests in my PR (rebase).