Changes needed for proper opt-list handling
Merge pull request #26 from delving/opt-list-fixes

Changes needed for proper opt-list handling