Thanks Jason, I'm sending patch #2.

Ready for trunk?
Martin