Merge branches 'rama1' and 'rama2' into rama1
mas funcionalidad en rama4