Add key 'orig_opt' for each option
Release v0.08