Worked on RG-146
Merge pull request #95 from mayurjadhav/RG-146

Worked on RG-146