Merge pull request #1 from nsoranzo/master

Fix some options.