Refactor opt parse
Merge branch 'feature/remove-option-convert-string' into develop