Worked on RG-167
Merge pull request #118 from mayurjadhav/RG-167

Worked on RG-167