more changes to shapes
Merge branch 'master' of https://github.com/MMazzocchi/kiwi