Refactoring
Merge pull request #20 from syohex/refactoring

Refactoring