Allow combined long and short options. Fixes #1.