Properly merge options.
Merge pull request #35 from jlesage/options_fix

Properly merge options. (Thanks SO MUCH. I can't believe I missed that one)