Merge pull request #204 from ngoldman/master

Basic multipolygon support