Merge pull request #1 from tokuhirom/master

6.02->6.09