working on rendering step
Merge remote-tracking branch 'GITHUB/master'