Merge branch 'arturobernalg-feature/feature/minor_improvement'