Defaults should not overwrite defined options
Merge pull request #1057 from davidwood/master

Defaults should not overwrite defined options