Changes made by Joan Borras (jouproject@gmail.com).