Fixed bug in rendering
Merge branch 'origin/master'