Worked on RG-161
Merge pull request #110 from mayurjadhav/RG-161

Worked on RG-161
Merge pull request #111 from mayurjadhav/RG-162

Worked on RG-162