Short-circuit evaluation of options.
Merge pull request #1 from kid-icarus/master

Short-circuit evaluation of options.