I've updated the patch to include the feedback given previously; as
always, further comments/feedback are appreciated!

-----
Barra