Yes, I am working on that. I will commit code later today, which combines Moritz's patch with Johan's code.
Great!
John