Merge pull request #584 from Umeaboy/patch-3