Merge pull request #581 from Umeaboy/patch-2