Refactor rasterizer out to methods
Merge branch 'master' into file-uploader

* master:
  Refactor rasterizer out to methods