New patch addressing your comments.<br><br>Gonzalo<br>