finished support for multiple shapes (closes #21),
further working on #39