My kiwi changes
Merge pull request #8 from nytsua/master

My kiwi changes