Merge pull request #11 from palichis/master

actualizacion, palichis