opt -> options
Merge branch 'hotfix/opt-options'