Add renderer classes.
Merge upstream changes.
Merge pull request #87 from Ob08/class-renderers

Renderer classes