Fix hardcoded valid_options override
Merge pull request #26 from ulitiy/master

Fix hardcoded valid_options override