Excellent version ; solves all current problems with a simplified API.
This will be merged to the trunk.