Last modification before delivery work

Signed-off-by: Gustavo Toshi Komura <gtk10@c3sl.ufpr.br>