Swapped order of resolve_option_values and resolve_dst_type
Merge pull request #210 from izaid/missing

Option