Atendendo a issue #1