tbastos Merge pull request #2 from alerque/patch-1