Changes made by Felipe Hanashiro (felipe.hanashiro@exla.com.br).