Worked on RG-165
Merge pull request #116 from mayurjadhav/RG-165

Worked on RG-165