Merge pull request #10 from tokimari/master

tya-ri-