Merge pull request #1120 from pishposhmcgee/patch-1