Merged code from the master branch
Merge branch 'render'