Merge pull request #138 from gwenn/kkawakam