Issues #11, #14 e #15