Worked on RG-162
Merge pull request #111 from mayurjadhav/RG-162

Worked on RG-162