cambio rama 4
actualizando origen master Merge branch 'master' into rama4
Merge pull request #3 from pedroprieto/rama4

Rama4