Rendering should work now, only getting it to the rendering is not done yet
Merge remote-tracking branch 'origin/master'