Add multipoint support

Addresses #9