Fix option bugs
Merge pull request #69 from chen3feng/develop

Fix option bugs