refactoring
Merge pull request #1 from hatyuki/develop

refactoring