Changes made by Fernando Toro (ft@ftpha.com).