Iniciando branch issue1

Merge entre master e issue1