Updated to latest ClassicWorld.NET