Vector and Raster changes.
Merge pull request #7 from lossyrob/master

Vector and Raster changes.