Refactoring
Merge pull request #1 from komita1981/master

Refactoring