copy/paste and redo fixes
Merge branch 'master' of https://github.com/MMazzocchi/kiwi