Fixed size bug
Merge branch 'graphics'