Updated merge

Signed-off-by: Alan Rodriguez <alanrodriguezromero@gmail.com>