Added the --set-option and  --unset-option switches.