Merge pull request #582 from Umeaboy/patch-1