Option load fix
Merge branch 'hotfix/v0.1.1'