Merge pull request #72 from oparoz/patch-2