Merge pull request #158 from mayurjadhav/RG-198

Worked on RG-198