Merge pull request #811 from quillford/patch-1