Fixed option key value bug and remove unused option.
Merge remote-tracking branch 'origin/master'