Merge pull request #124 from kairyu/6kro