Fixes #156
Fixes #148
Merge branch 'bug/graphics' into develop