commit
Merge pull request #14 from toyamigo/master

commit