Merge pull request #12 from MiUishadow/master

123
Merge pull request #6 from github-jay/master

Merge pull request #12 from MiUishadow/master