Merge pull request #85 from alvar0hurtad0/patch-2