Options correction
Merge pull request #352 from fyrz/OptionsTestMergeProblem

Options correction related to merge