[Update] Kiwi (2.0.4)
Merge pull request #1182 from allending/master

[Update] Kiwi (2.0.4)