Merge pull request #14 from ManuelCintron/master

updating
Merge pull request #11 from fssaez/master

updating