Worked on RG-127
Merge pull request #113 from mayurjadhav/RG-127

Worked on RG-127