Merge pull request #53 from Edzelopez/RG-116

RG-116 -- Fixed changed option values