small Bugfix within the Render function
Merge branch 'soontobe-0.5-master' into develop