Fix double dash option
Merge branch 'iborder' of https://github.com/enthalpy-yan/OPChooser into iborder