Merge pull request #827 from ShivamKR12/patch-1