Segundo Commit - Stanislaw
Merge branch 'stanycruz'