Using new option macro.
Merge pull request #45 from shun159/using_new_options_macro

Using new options macro