Merge pull request #739 from LipkeGu/patch-1