trim options showing
Merge branch 'hotfix-0.0.1'