Partial fix to #55
Merge branch 'graphics'