Listo issue #14 e issue #15