Merge pull request #32 from miigotu/patch-1