Set return in setOptions function
Merge pull request #433 from samuelhuarachi/master

Set return in setOptions function