Some work on rendering
Merge remote-tracking branch 'origin/master'