Issue #71
Issues #71 e #69