Merge pull request #1 from Ryuno-Ki/master