Merge pull request #16 from JuanitoFatas/patch-1