Fixed the issues with rendering to mobile devices.
Merge branch 'master' into gh-pages