Refactor package
Merge pull request #18 from kazuhira-r/develop

Refactor package