RG-128 Changed if conditioning
Merge pull request #77 from Edzelopez/RG-128

RG-128 Changed if conditioning