Merge pull request #145 from gwenn/kkawakam

Misc