Refactoring for options
Merge pull request #18 from junichi11/junichi11/refactoring-for-options

Refactoring for options