[Update] Kiwi (2.0.2)
Merge pull request #1059 from allending/master

[Update] Kiwi (2.0.2)