New gfx;)
Minor fix
Merge branch 'master' into dev