Merge pull request #597 from skids/patch-1