Merge pull request #2 from kupoyuki/master

Merge pull request #5 from chemisax/master
Merge pull request #6 from chemisax/master

Merge pull request #2 from kupoyuki/master