Complete refactoring once
Fix bad conflict resolution during merging the upstream
Merge pull request #48 from yanoh/pullreq/refactoring

リファクタリング