Merge pull request #633 from alanbuxey/patch-1