Issues #65 e #61
Issues #65