Merge pull request #1 from iriiiina/1.0

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

Merge pull request #1 from iriiiina/1.0