Merge pull request #16 from davidcavazos/patch-1