added graphics
Merge branch 'graphics'