Worked on RG-161
Merge pull request #110 from mayurjadhav/RG-161

Worked on RG-161