Merge pull request #1 from iriiiina/v1.5

v1.5
Merge pull request #2 from iriiiina/master

Merge pull request #1 from iriiiina/v1.5