Fix #11
Merge pull request #13 from pedrogimenez/fix-options

Fix #11