Merge pull request #625 from kkirsche/patch-1