Merge pull request #1284 from dschwartz783/patch-1