Issues #49 e #48