Merge pull request #2 from xysmas/master

Graphics