Cambios chicos

:)
Merge branch 'master' into Yoshua
Cambios KMS