Worked on RG-142
Merge pull request #78 from mayurjadhav/RG-142

Worked on RG-142