Patched the Image Issue - #5827
Merge pull request #4 from tanmaysaxena/feature/task-5827

Patched the Image Issue - #5827