Merge pull request #835 from HorstKakuschke/master