Merge pull request #831 from danrl/patch-1