done: issues #30, #31, #32, #33 e #34