do not accept prefix of long commandline options
Merge review 162 by @tryneus
Merge branch 'next' into sam_121