Check if options are set before overwriting
Merge pull request #2 from mMontu/master

Check if options are set before overwriting