Merge pull request #583 from Umeaboy/patch-2