Merge pull request #1149 from pishposhmcgee/patch-3