Final al viernes 24-10

Signed-off-by: porjolovsky <porjolovsky@bitbucket.org>