fix render bugs #219, #262 and #227
Merge branch 'master' of github.com:transparencyint/CGIP into f-render-bugs