Second commit

Signed-off-by: Emanuel C Machado <emanuel.c.machado@gmail.com>