Add renderer
Merge branch 'develop'