Merged Renderer and Base
Merge pull request #12 from johngeorgewright/11-merge-renderer-and-base

Merged Renderer and Base