96e3b44 Merge pull request #15 from Zearin/patch-1