Here is an updated patch.

Samuel