Merge pull request #1 from agustincl/master

FIx