Fix confusing -1 default option for guarded mode.
Fixed Get*Option
Merge pull request #12 from FrozenKiwi/rivera

Fixed Get*Option
Merge branch 'rothko' into picasso