Update from Juan Manuel Guerrero.
16 files changed