Last changes before project delivery

Signed-off-by: Luiz Carlos Cavalcanti <cavalcanti.luiz@gmail.com>