Merge pull request #17 from deadpoets/master

Graphics tweaks