Merge pull request #32 from ebraminio/patch-1