Correct options merging. Fixes #87