Changes made by Ivan Jarque (ivanjarque@hotmail.com).