Merge pull request #82 from alvar0hurtad0/patch-1