Fixed option fallbacks.
Merge pull request #30 from jeffmay/master

[master] Fixed option fallbacks.