Worked on RG-179
Merge pull request #124 from mayurjadhav/RG-179

Worked on RG-179