Change multipoint features to individual points

Addresses #133, #149