Merge pull request #878 from cclauss/patch-1