Worked on RG-164
Merge pull request #112 from mayurjadhav/RG-164

Worked on RG-164