Merge pull request #2 from fcastan1/master

Bring Francisco's Changes to my branch