Final push before porting to SFML 2
Updated to SFML 2!