Merge pull request #2 from Tokuriku/master

hioh