Merge pull request #1 from o-seirou/make_test

[WIP] make test
Merge pull request #2 from o-seirou/master

Merge pull request #1 from o-seirou/make_test