Merge pull request #71 from oparoz/patch-1