Merge pull request #525 from dorkster/bugfixes

Don't free screen surface when exiting