cambios fixed #1 fixed #4