Reformat.
Issue #34: fix mix on items of different shapes.
Merge remote-tracking branch 'origin/master' into gh-pages
built demo