Fixing option flow for comma separated lists

Fixing #311

For other changes from the full release, check the 4.0.x release notes.