Merge pull request #1255 from alanbuxey/patch-8