Merged SDL Branch to the main program

MEEEERRRRRRRRGGGGGGGEEEEEE