Commiting Marcus' changes in render.js.
Merge pull request #48 from psb/development

Commiting Marcus' changes in render.js.