Merge pull request #77 from Edzelopez/RG-128

RG-128 Changed if conditioning
Worked on RG-142
Merge pull request #78 from mayurjadhav/RG-142

Worked on RG-142