refactoring
Merge pull request #37 from 1000ch/dev

refactoring