bugfix
Merge branch 'custom-renderer' into space-deminer