Merge pull request #3390 from bobafetthotmail/patch-16