Tolerate passed options
Merge pull request #2 from kunik/master

Tolerate passed options