refactoring
Merge pull request #2 from naoto/refactor

refactoring