Merge pull request #748 from bernhardschmidt/patch-1