Worked on RG-184
Merge pull request #129 from mayurjadhav/RG-184

Worked on RG-184