Merge pull request #5 from ematipico/patch-1