Fix option parsing for issue #19