Changed to Spanish
fixed merge