Merge pull request #2 from fcastan1/master

Bring Francisco's Changes to my branch
Merge pull request #3 from fcastan1/GarzaWicker

Merge pull request #2 from fcastan1/master