refactoring
fixed
Merge pull request #2 from risuoku/develop

Develop