Fix wrong merge and recognition of short/long option

* match short and long option when provided
* regexp can recognize if the option is short or not

Author: toch