do refactoring
Merge pull request #11 from necobaka/patch-1

do refactoring