Merge pull request #797 from AI0867/patch-1