refactoring codes, handle Kind more generally
remove comment out of test code
change function name
Merge pull request #4 from yosukesuzuki/refactor

refactoring codes, handle Kind more generally