Changes made by Luis Hostienda (luis@hostienda.com).