Bug fix: Options with multiple values

Options that had multiple values where chopped because they were
supposed to have a space splitting, but the space already split the
options. Changed to use a comma when splitting options values.