Pee kuroemon patch 2

Merge branch and merge pull request