Fixes #166
Merge branch 'bug/graphics' into develop