Merge pull request #1 from akskinner/master

Does this work?
Merge pull request #4 from shortnick/master

Trying to get raster