Merge pull request #1250 from alanbuxey/patch-4