Worked on RG-190
Merge pull request #136 from mayurjadhav/RG-190

Worked on RG-190
RG-163 Worked on code styling
Merge pull request #138 from mayurjadhav/RG-163

Rg 163