Resueltos issue #65 e issue #58