schweitzpgi Merge pull request #1109 from hattom/patch-1