Merge pull request #1 from Sakurakyoko/master

Test
Merge pull request #2 from Sakurakyoko/hotfix

Merge pull request #1 from Sakurakyoko/master