Merge pull request #16 from oipmuy/patch-1