Merge pull request #770 from arturdm/patch-1