[Update] Kiwi (2.0.3)
Merge pull request #1117 from allending/master

[Update] Kiwi (2.0.3)