Commit final.

Signed-off-by: Armando Couto <armando-couto@hotmail.com>