Feature/nil default options

Recreated the pull request after fixing the check.

The idea is to check the configuration values returned and to not set options that don't have default values.