Merge pull request #1926 from elfprince13/patch-1