worked on RG-105 and other related bug fixes
Merge pull request #67 from mayurjadhav/RG-105

worked on RG-105 and other related bug fixes