Merge pull request #1 from LoliMizuki/master

test sync with origin