Add multipoint support

Addresses #9.  Replaces pull request #48.