handle Kiwi 2.x
Merge pull request #18 from marklarr/master

handle Kiwi 2.x