Done. If everything looks good, would you do the honor of merging this? :p