Merge pull request #88 from JuanmaMR/patch-2