Fixes #196
Merge branch 'refactoring/graphics' into develop