Merge pull request #15 from fssaez/master

pull
Merge pull request #16 from fssaez/master

np
Merge pull request #17 from fssaez/master

pull
Merge pull request #18 from ManuelCintron/master

updating