Merge pull request #589 from stephenjbell/patch-1