Support list of options with a trailing argument. Fixes 3 of 4 language agnostic tests.
Merge pull request #1 from markusn/support-options-with-trailing-argument

Support list of options with a trailing argument