Fixed typo
Minor edits
Merge branch 'master' of github.com:plmday/Kiwi