Refactoring
Refactoring
add tests
Add tests
Merge pull request #2 from kohkimakimoto/v1.1

Marge V1.1