A better fix for the options bug.
Merge branch 'hotfix/v0.0.4'