Add support for disabled <options>
Improve initialization
Minor disabled fixes
Merge pull request #11 from nickb1080/feat/disabled

Feat/disabled