Commit 24/05 - 19h43

Signed-off-by: Bruno Corrêa <brunoteixeiralc@gmail.com>