Fixes #157
Merge branch 'features/graphics-Transform' into develop